From: Prateek Saxena <prtksxna@gmail.com>
Date: Wed, 30 Sep 2015 20:31:52 +0000 (+0530)
Subject: mw.Upload.BookletLayout: Make all errors unrecoverable
X-Git-Tag: 1.31.0-rc.0~9629
X-Git-Url: http://git.cyclocoop.org/%7D%7Cconcat%7B?a=commitdiff_plain;h=048b0c2b7a49820fb3785f8b84a61ddb69b5631c;p=lhc%2Fweb%2Fwiklou.git

mw.Upload.BookletLayout: Make all errors unrecoverable

Any error apart from 503's can't be recovered just by hitting 'Try
Again'. The user will _have_ to make some changes before the process
can continue.

Bug: T114130
Change-Id: I8e2d619be5b7e47bc903155c353bc1da36a62bb6
---

diff --git a/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js b/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
index fa2fb0b831..df28611e8a 100644
--- a/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
+++ b/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
@@ -190,11 +190,15 @@
 		} );
 		this.uploadPromise.always( function () {
 			if ( layout.upload.getState() === mw.Upload.State.ERROR ) {
-				deferred.reject( new OO.ui.Error( mw.msg( 'upload-process-error' )  ) );
+				deferred.reject( new OO.ui.Error( mw.msg( 'upload-process-error' ), {
+					recoverable: false
+				} ) );
 				return false;
 			}
 			if ( layout.upload.getState() === mw.Upload.State.WARNING ) {
-				deferred.reject( new OO.ui.Error( mw.msg( 'upload-process-error' )  ) );
+				deferred.reject( new OO.ui.Error( mw.msg( 'upload-process-error' ), {
+					recoverable: false
+				} ) );
 				return false;
 			}
 		} );
@@ -225,12 +229,16 @@
 				var name;
 
 				if ( layout.upload.getState() === mw.Upload.State.ERROR ) {
-					deferred.reject( new OO.ui.Error( mw.msg( 'upload-process-error' ) ) );
+					deferred.reject( new OO.ui.Error( mw.msg( 'upload-process-error' ), {
+						recoverable: false
+					} ) );
 					return false;
 				}
 
 				if ( layout.upload.getState() === mw.Upload.State.WARNING ) {
-					deferred.reject( new OO.ui.Error( mw.msg( 'upload-process-warning' ) ) );
+					deferred.reject( new OO.ui.Error( mw.msg( 'upload-process-warning' ), {
+						recoverable: false
+					} ) );
 					return false;
 				}